/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_xemacs.idb / usr / freeware / lib / xemacs-20.4 / lisp / ediff / ediff-tbar.elc.z / ediff-tbar.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar  9 12|
|00000040| 3a 34 38 3a 32 39 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:29 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 74 62 61 72 2e 65 6c 0a |f/ediff-|tbar.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 |    (err|or "`edi|
|000001f0| 66 66 2d 74 62 61 72 2e | 65 6c 27 20 77 61 73 20 |ff-tbar.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 0b 42 13 c4 c5 |code "..|!...B...|
|00000270| 21 87 22 20 5b 70 72 6f | 76 69 64 65 20 65 64 69 |!." [pro|vide edi|
|00000280| 66 66 2d 74 62 61 72 20 | 74 6f 6f 6c 62 61 72 2d |ff-tbar |toolbar-|
|00000290| 69 63 6f 6e 2d 64 69 72 | 65 63 74 6f 72 79 20 63 |icon-dir|ectory c|
|000002a0| 75 72 72 65 6e 74 2d 6c | 6f 61 64 2d 6c 69 73 74 |urrent-l|oad-list|
|000002b0| 20 72 65 71 75 69 72 65 | 20 65 64 69 66 66 2d 69 | require| ediff-i|
|000002c0| 6e 69 74 5d 20 32 29 0a | 23 40 32 39 33 20 49 66 |nit] 2).|#@293 If|
|000002d0| 20 74 2c 20 45 64 69 66 | 66 20 77 69 6c 6c 20 75 | t, Edif|f will u|
|000002e0| 73 65 20 61 20 74 6f 6f | 6c 62 61 72 20 66 6f 72 |se a too|lbar for|
|000002f0| 20 74 68 65 20 63 6f 6e | 74 72 6f 6c 20 66 72 61 | the con|trol fra|
|00000300| 6d 65 2e 0a 54 68 69 73 | 20 68 61 73 20 61 6e 20 |me..This| has an |
|00000310| 65 66 66 65 63 74 20 6f | 6e 6c 79 20 69 66 20 79 |effect o|nly if y|
|00000320| 6f 75 72 20 65 6d 61 63 | 73 20 73 75 70 70 6f 72 |our emac|s suppor|
|00000330| 74 73 20 54 6f 6f 6c 62 | 61 72 73 2e 0a 43 75 72 |ts Toolb|ars..Cur|
|00000340| 72 65 6e 74 6c 79 2c 20 | 58 45 6d 61 63 73 20 64 |rently, |XEmacs d|
|00000350| 6f 65 73 2c 20 62 75 74 | 20 6e 6f 74 20 45 6d 61 |oes, but| not Ema|
|00000360| 63 73 2e 0a 44 6f 20 6e | 6f 74 20 63 68 61 6e 67 |cs..Do n|ot chang|
|00000370| 65 20 74 68 65 20 76 61 | 6c 75 65 20 6f 66 20 74 |e the va|lue of t|
|00000380| 68 69 73 20 76 61 72 69 | 61 62 6c 65 20 69 6e 74 |his vari|able int|
|00000390| 65 72 61 63 74 69 76 65 | 6c 79 2e 0a 54 68 69 73 |eractive|ly..This|
|000003a0| 20 73 68 6f 75 6c 64 20 | 62 65 20 64 6f 6e 65 20 | should |be done |
|000003b0| 6f 6e 6c 79 20 76 69 61 | 20 74 68 65 20 6d 65 6e |only via| the men|
|000003c0| 75 20 62 61 72 20 6f 72 | 20 62 79 20 65 78 65 63 |u bar or| by exec|
|000003d0| 75 74 69 6e 67 0a 60 65 | 64 69 66 66 2d 74 6f 67 |uting.`e|diff-tog|
|000003e0| 67 6c 65 2d 75 73 65 2d | 74 6f 6f 6c 62 61 72 27 |gle-use-|toolbar'|
|000003f0| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|00000400| 2d 75 73 65 2d 74 6f 6f | 6c 62 61 72 2d 70 20 6e |-use-too|lbar-p n|
|00000410| 69 6c 20 28 23 24 20 2e | 20 37 31 38 29 29 0a 23 |il (#$ .| 718)).#|
|00000420| 40 39 33 20 54 68 65 20 | 68 65 69 67 68 74 20 6f |@93 The |height o|
|00000430| 66 20 74 68 65 20 45 64 | 69 66 66 20 74 6f 6f 6c |f the Ed|iff tool|
|00000440| 62 61 72 2e 0a 54 68 65 | 20 76 61 6c 75 65 20 6d |bar..The| value m|
|00000450| 75 73 74 20 6d 61 74 63 | 68 20 74 68 65 20 61 63 |ust matc|h the ac|
|00000460| 74 75 61 6c 20 73 69 7a | 65 20 6f 66 20 74 68 65 |tual siz|e of the|
|00000470| 20 74 6f 6f 6c 62 61 72 | 20 69 63 6f 6e 73 2e 1f | toolbar| icons..|
|00000480| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 74 |.(defvar| ediff-t|
|00000490| 6f 6f 6c 62 61 72 2d 68 | 65 69 67 68 74 20 32 31 |oolbar-h|eight 21|
|000004a0| 20 28 23 24 20 2e 20 31 | 30 36 30 29 29 0a 23 40 | (#$ . 1|060)).#@|
|000004b0| 33 30 33 20 54 68 65 20 | 77 69 64 74 68 20 6f 66 |303 The |width of|
|000004c0| 20 74 68 65 20 45 64 69 | 66 66 20 74 6f 6f 6c 62 | the Edi|ff toolb|
|000004d0| 61 72 2e 0a 54 68 65 20 | 76 61 6c 75 65 20 6d 75 |ar..The |value mu|
|000004e0| 73 74 20 6d 61 74 63 68 | 20 74 68 65 20 61 63 74 |st match| the act|
|000004f0| 75 61 6c 20 77 69 64 74 | 68 20 6f 66 20 74 68 65 |ual widt|h of the|
|00000500| 20 74 6f 6f 6c 62 61 72 | 2e 0a 48 65 72 65 27 73 | toolbar|..Here's|
|00000510| 20 61 6e 20 65 78 61 6d | 70 6c 65 3a 0a 20 20 20 | an exam|ple:.   |
|00000520| 20 54 68 65 72 65 20 61 | 72 65 20 31 30 20 62 75 | There a|re 10 bu|
|00000530| 74 74 6f 6e 73 2c 20 65 | 61 63 68 20 31 35 20 70 |ttons, e|ach 15 p|
|00000540| 69 78 65 6c 73 20 6c 61 | 72 67 65 2c 20 61 6e 64 |ixels la|rge, and|
|00000550| 20 74 68 65 20 73 68 61 | 64 6f 77 73 20 6f 63 63 | the sha|dows occ|
|00000560| 75 70 79 20 32 0a 20 20 | 20 70 69 78 65 6c 73 20 |upy 2.  | pixels |
|00000570| 65 61 63 68 20 73 69 64 | 65 2c 20 61 6e 64 20 74 |each sid|e, and t|
|00000580| 68 65 20 6c 61 73 74 20 | 62 75 74 74 6f 6e 20 69 |he last |button i|
|00000590| 73 20 72 69 67 68 74 2d | 6a 75 73 74 69 66 69 65 |s right-|justifie|
|000005a0| 64 20 28 73 6f 20 77 65 | 20 72 65 73 65 72 76 65 |d (so we| reserve|
|000005b0| 0a 20 20 20 61 62 6f 75 | 74 20 33 30 20 70 69 78 |.   abou|t 30 pix|
|000005c0| 65 6c 73 20 66 6f 72 20 | 66 69 6c 6c 20 73 70 61 |els for |fill spa|
|000005d0| 63 65 29 20 3d 20 32 30 | 30 20 70 69 78 65 6c 73 |ce) = 20|0 pixels|
|000005e0| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|000005f0| 2d 74 6f 6f 6c 62 61 72 | 2d 77 69 64 74 68 20 32 |-toolbar|-width 2|
|00000600| 30 30 2e 30 20 28 23 24 | 20 2e 20 31 32 30 34 29 |00.0 (#$| . 1204)|
|00000610| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00000620| 66 66 2d 68 61 73 2d 74 | 6f 6f 6c 62 61 72 2d 73 |ff-has-t|oolbar-s|
|00000630| 75 70 70 6f 72 74 2d 70 | 20 23 5b 6e 69 6c 20 22 |upport-p| #[nil "|
|00000640| 08 ad 87 c1 c2 21 ad 82 | c3 20 87 22 20 5b 65 64 |.....!..|. ." [ed|
|00000650| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 66 65 61 |iff-xema|cs-p fea|
|00000660| 74 75 72 65 70 20 74 6f | 6f 6c 62 61 72 20 63 6f |turep to|olbar co|
|00000670| 6e 73 6f 6c 65 2d 6f 6e | 2d 77 69 6e 64 6f 77 2d |nsole-on|-window-|
|00000680| 73 79 73 74 65 6d 2d 70 | 5d 20 32 5d 29 0a 28 64 |system-p|] 2]).(d|
|00000690| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 75 |efalias |'ediff-u|
|000006a0| 73 65 2d 74 6f 6f 6c 62 | 61 72 2d 70 20 23 5b 6e |se-toolb|ar-p #[n|
|000006b0| 69 6c 20 22 c0 20 ad 81 | 09 87 22 20 5b 65 64 69 |il ". ..|.." [edi|
|000006c0| 66 66 2d 68 61 73 2d 74 | 6f 6f 6c 62 61 72 2d 73 |ff-has-t|oolbar-s|
|000006d0| 75 70 70 6f 72 74 2d 70 | 20 65 64 69 66 66 2d 75 |upport-p| ediff-u|
|000006e0| 73 65 2d 74 6f 6f 6c 62 | 61 72 2d 70 5d 20 31 5d |se-toolb|ar-p] 1]|
|000006f0| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00000700| 66 66 2d 63 6f 6d 70 75 | 74 65 2d 74 6f 6f 6c 62 |ff-compu|te-toolb|
|00000710| 61 72 2d 77 69 64 74 68 | 20 23 5b 6e 69 6c 20 22 |ar-width| #[nil "|
|00000720| c0 20 ac 82 c1 87 c2 0b | c4 c5 c6 21 21 a5 21 87 |. ......|...!!.!.|
|00000730| 22 20 5b 65 64 69 66 66 | 2d 75 73 65 2d 74 6f 6f |" [ediff|-use-too|
|00000740| 6c 62 61 72 2d 70 20 30 | 20 63 65 69 6c 69 6e 67 |lbar-p 0| ceiling|
|00000750| 20 65 64 69 66 66 2d 74 | 6f 6f 6c 62 61 72 2d 77 | ediff-t|oolbar-w|
|00000760| 69 64 74 68 20 66 6f 6e | 74 2d 69 6e 73 74 61 6e |idth fon|t-instan|
|00000770| 63 65 2d 77 69 64 74 68 | 20 66 61 63 65 2d 66 6f |ce-width| face-fo|
|00000780| 6e 74 2d 69 6e 73 74 61 | 6e 63 65 20 64 65 66 61 |nt-insta|nce defa|
|00000790| 75 6c 74 5d 20 35 5d 29 | 0a 23 40 33 34 20 4e 65 |ult] 5])|.#@34 Ne|
|000007a0| 78 74 20 64 69 66 66 65 | 72 65 6e 63 65 20 69 63 |xt diffe|rence ic|
|000007b0| 6f 6e 20 69 6e 20 74 6f | 6f 6c 62 61 72 2e 1f 0a |on in to|olbar...|
|000007c0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 74 6f |(defvar |ediff-to|
|000007d0| 6f 6c 62 61 72 2d 6e 65 | 78 74 2d 69 63 6f 6e 20 |olbar-ne|xt-icon |
|000007e0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 ad |(byte-co|de "..!.|
|000007f0| 8f c2 c3 c0 c4 21 ab 83 | c5 aa 81 c6 0e 07 5c 22 |.....!..|......\"|
|00000800| 21 87 22 20 5b 66 65 61 | 74 75 72 65 70 20 74 6f |!." [fea|turep to|
|00000810| 6f 6c 62 61 72 20 74 6f | 6f 6c 62 61 72 2d 6d 61 |olbar to|olbar-ma|
|00000820| 6b 65 2d 62 75 74 74 6f | 6e 2d 6c 69 73 74 20 65 |ke-butto|n-list e|
|00000830| 78 70 61 6e 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |xpand-fi|le-name |
|00000840| 78 70 6d 20 22 65 64 69 | 66 66 2d 6e 65 78 74 2e |xpm "edi|ff-next.|
|00000850| 78 70 6d 22 20 22 65 64 | 69 66 66 2d 6e 65 78 74 |xpm" "ed|iff-next|
|00000860| 2e 78 62 6d 22 20 74 6f | 6f 6c 62 61 72 2d 69 63 |.xbm" to|olbar-ic|
|00000870| 6f 6e 2d 64 69 72 65 63 | 74 6f 72 79 5d 20 34 29 |on-direc|tory] 4)|
|00000880| 20 28 23 24 20 2e 20 31 | 39 35 30 29 29 0a 23 40 | (#$ . 1|950)).#@|
|00000890| 33 38 20 50 72 65 76 69 | 6f 75 73 20 64 69 66 66 |38 Previ|ous diff|
|000008a0| 65 72 65 6e 63 65 20 69 | 63 6f 6e 20 69 6e 20 74 |erence i|con in t|
|000008b0| 6f 6f 6c 62 61 72 2e 1f | 0a 28 64 65 66 76 61 72 |oolbar..|.(defvar|
|000008c0| 20 65 64 69 66 66 2d 74 | 6f 6f 6c 62 61 72 2d 70 | ediff-t|oolbar-p|
|000008d0| 72 65 76 69 6f 75 73 2d | 69 63 6f 6e 20 28 62 79 |revious-|icon (by|
|000008e0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 ad 8f c2 c3 |te-code |"..!....|
|000008f0| c0 c4 21 ab 83 c5 aa 81 | c6 0e 07 5c 22 21 87 22 |..!.....|...\"!."|
|00000900| 20 5b 66 65 61 74 75 72 | 65 70 20 74 6f 6f 6c 62 | [featur|ep toolb|
|00000910| 61 72 20 74 6f 6f 6c 62 | 61 72 2d 6d 61 6b 65 2d |ar toolb|ar-make-|
|00000920| 62 75 74 74 6f 6e 2d 6c | 69 73 74 20 65 78 70 61 |button-l|ist expa|
|00000930| 6e 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 78 70 6d |nd-file-|name xpm|
|00000940| 20 22 65 64 69 66 66 2d | 70 72 65 76 2e 78 70 6d | "ediff-|prev.xpm|
|00000950| 22 20 22 65 64 69 66 66 | 2d 70 72 65 76 2e 78 62 |" "ediff|-prev.xb|
|00000960| 6d 22 20 74 6f 6f 6c 62 | 61 72 2d 69 63 6f 6e 2d |m" toolb|ar-icon-|
|00000970| 64 69 72 65 63 74 6f 72 | 79 5d 20 34 29 20 28 23 |director|y] 4) (#|
|00000980| 24 20 2e 20 32 31 39 35 | 29 29 0a 23 40 33 32 20 |$ . 2195|)).#@32 |
|00000990| 53 65 6c 65 63 74 20 64 | 69 66 66 20 41 20 69 63 |Select d|iff A ic|
|000009a0| 6f 6e 20 69 6e 20 74 6f | 6f 6c 62 61 72 2e 1f 0a |on in to|olbar...|
|000009b0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 74 6f |(defvar |ediff-to|
|000009c0| 6f 6c 62 61 72 2d 41 2d | 69 63 6f 6e 20 28 62 79 |olbar-A-|icon (by|
|000009d0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 ad a9 c2 c3 |te-code |"..!....|
|000009e0| c0 c4 21 ab 83 c5 aa 81 | c6 0e 07 5c 22 c3 c0 c4 |..!.....|...\"...|
|000009f0| 21 ab 83 c5 aa 81 c6 0e | 07 5c 22 c3 c0 c4 21 ab |!.......|.\"...!.|
|00000a00| 83 c8 aa 81 c6 0e 07 5c | 22 23 87 22 20 5b 66 65 |.......\|"#." [fe|
|00000a10| 61 74 75 72 65 70 20 74 | 6f 6f 6c 62 61 72 20 74 |aturep t|oolbar t|
|00000a20| 6f 6f 6c 62 61 72 2d 6d | 61 6b 65 2d 62 75 74 74 |oolbar-m|ake-butt|
|00000a30| 6f 6e 2d 6c 69 73 74 20 | 65 78 70 61 6e 64 2d 66 |on-list |expand-f|
|00000a40| 69 6c 65 2d 6e 61 6d 65 | 20 78 70 6d 20 22 65 64 |ile-name| xpm "ed|
|00000a50| 69 66 66 2d 41 2d 75 70 | 2e 78 70 6d 22 20 22 65 |iff-A-up|.xpm" "e|
|00000a60| 64 69 66 66 2d 41 2d 75 | 70 2e 78 62 6d 22 20 74 |diff-A-u|p.xbm" t|
|00000a70| 6f 6f 6c 62 61 72 2d 69 | 63 6f 6e 2d 64 69 72 65 |oolbar-i|con-dire|
|00000a80| 63 74 6f 72 79 20 22 65 | 64 69 66 66 2d 41 2d 78 |ctory "e|diff-A-x|
|00000a90| 78 2e 78 70 6d 22 5d 20 | 36 29 20 28 23 24 20 2e |x.xpm"] |6) (#$ .|
|00000aa0| 20 32 34 34 38 29 29 0a | 23 40 33 32 20 53 65 6c | 2448)).|#@32 Sel|
|00000ab0| 65 63 74 20 64 69 66 66 | 20 42 20 69 63 6f 6e 20 |ect diff| B icon |
|00000ac0| 69 6e 20 74 6f 6f 6c 62 | 61 72 2e 1f 0a 28 64 65 |in toolb|ar...(de|
|00000ad0| 66 76 61 72 20 65 64 69 | 66 66 2d 74 6f 6f 6c 62 |fvar edi|ff-toolb|
|00000ae0| 61 72 2d 42 2d 69 63 6f | 6e 20 28 62 79 74 65 2d |ar-B-ico|n (byte-|
|00000af0| 63 6f 64 65 20 22 c0 c1 | 21 ad a9 c2 c3 c0 c4 21 |code "..|!......!|
|00000b00| ab 83 c5 aa 81 c6 0e 07 | 5c 22 c3 c0 c4 21 ab 83 |........|\"...!..|
|00000b10| c5 aa 81 c6 0e 07 5c 22 | c3 c0 c4 21 ab 83 c8 aa |......\"|...!....|
|00000b20| 81 c6 0e 07 5c 22 23 87 | 22 20 5b 66 65 61 74 75 |....\"#.|" [featu|
|00000b30| 72 65 70 20 74 6f 6f 6c | 62 61 72 20 74 6f 6f 6c |rep tool|bar tool|
|00000b40| 62 61 72 2d 6d 61 6b 65 | 2d 62 75 74 74 6f 6e 2d |bar-make|-button-|
|00000b50| 6c 69 73 74 20 65 78 70 | 61 6e 64 2d 66 69 6c 65 |list exp|and-file|
|00000b60| 2d 6e 61 6d 65 20 78 70 | 6d 20 22 65 64 69 66 66 |-name xp|m "ediff|
|00000b70| 2d 42 2d 75 70 2e 78 70 | 6d 22 20 22 65 64 69 66 |-B-up.xp|m" "edif|
|00000b80| 66 2d 42 2d 75 70 2e 78 | 62 6d 22 20 74 6f 6f 6c |f-B-up.x|bm" tool|
|00000b90| 62 61 72 2d 69 63 6f 6e | 2d 64 69 72 65 63 74 6f |bar-icon|-directo|
|00000ba0| 72 79 20 22 65 64 69 66 | 66 2d 42 2d 78 78 2e 78 |ry "edif|f-B-xx.x|
|00000bb0| 70 6d 22 5d 20 36 29 20 | 28 23 24 20 2e 20 32 37 |pm"] 6) |(#$ . 27|
|00000bc0| 33 33 29 29 0a 23 40 36 | 37 20 54 6f 67 67 6c 65 |33)).#@6|7 Toggle|
|00000bd0| 20 73 70 6c 69 74 20 6d | 6f 64 65 20 62 65 74 77 | split m|ode betw|
|00000be0| 65 65 6e 20 73 69 64 65 | 2d 74 6f 2d 73 69 64 65 |een side|-to-side|
|00000bf0| 20 61 6e 64 20 6f 6e 65 | 2d 6f 6e 2d 74 6f 70 2d | and one|-on-top-|
|00000c00| 6f 66 2d 61 6e 6f 74 68 | 65 72 2e 1f 0a 28 64 65 |of-anoth|er...(de|
|00000c10| 66 76 61 72 20 65 64 69 | 66 66 2d 74 6f 6f 6c 62 |fvar edi|ff-toolb|
|00000c20| 61 72 2d 74 6f 67 67 6c | 65 2d 73 70 6c 69 74 2d |ar-toggl|e-split-|
|00000c30| 69 63 6f 6e 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |icon (by|te-code |
|00000c40| 22 c0 c1 21 ad 8f c2 c3 | c0 c4 21 ab 83 c5 aa 81 |"..!....|..!.....|
|00000c50| c6 0e 07 5c 22 21 87 22 | 20 5b 66 65 61 74 75 72 |...\"!."| [featur|
|00000c60| 65 70 20 74 6f 6f 6c 62 | 61 72 20 74 6f 6f 6c 62 |ep toolb|ar toolb|
|00000c70| 61 72 2d 6d 61 6b 65 2d | 62 75 74 74 6f 6e 2d 6c |ar-make-|button-l|
|00000c80| 69 73 74 20 65 78 70 61 | 6e 64 2d 66 69 6c 65 2d |ist expa|nd-file-|
|00000c90| 6e 61 6d 65 20 78 70 6d | 20 22 65 64 69 66 66 2d |name xpm| "ediff-|
|00000ca0| 74 6f 67 67 6c 65 2d 73 | 70 6c 69 74 2d 75 70 2e |toggle-s|plit-up.|
|00000cb0| 78 70 6d 22 20 22 65 64 | 69 66 66 2d 74 6f 67 67 |xpm" "ed|iff-togg|
|00000cc0| 6c 65 2d 73 70 6c 69 74 | 2d 75 70 2e 78 62 6d 22 |le-split|-up.xbm"|
|00000cd0| 20 74 6f 6f 6c 62 61 72 | 2d 69 63 6f 6e 2d 64 69 | toolbar|-icon-di|
|00000ce0| 72 65 63 74 6f 72 79 5d | 20 34 29 20 28 23 24 20 |rectory]| 4) (#$ |
|00000cf0| 2e 20 33 30 31 38 29 29 | 0a 23 40 32 30 20 53 61 |. 3018))|.#@20 Sa|
|00000d00| 76 65 20 6d 65 72 67 65 | 20 62 75 66 66 65 72 2e |ve merge| buffer.|
|00000d10| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00000d20| 74 6f 6f 6c 62 61 72 2d | 73 61 76 65 2d 69 63 6f |toolbar-|save-ico|
|00000d30| 6e 20 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |n (byte-|code "..|
|00000d40| 21 ad a9 c2 c3 c0 c4 21 | ab 83 c5 aa 81 c6 0e 07 |!......!|........|
|00000d50| 5c 22 c3 c0 c4 21 ab 83 | c5 aa 81 c6 0e 07 5c 22 |\"...!..|......\"|
|00000d60| c3 c0 c4 21 ab 83 c8 aa | 81 c9 0e 07 5c 22 23 87 |...!....|....\"#.|
|00000d70| 22 20 5b 66 65 61 74 75 | 72 65 70 20 74 6f 6f 6c |" [featu|rep tool|
|00000d80| 62 61 72 20 74 6f 6f 6c | 62 61 72 2d 6d 61 6b 65 |bar tool|bar-make|
|00000d90| 2d 62 75 74 74 6f 6e 2d | 6c 69 73 74 20 65 78 70 |-button-|list exp|
|00000da0| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 78 70 |and-file|-name xp|
|00000db0| 6d 20 22 65 64 69 66 66 | 2d 73 61 76 65 2e 78 70 |m "ediff|-save.xp|
|00000dc0| 6d 22 20 22 65 64 69 66 | 66 2d 73 61 76 65 2e 78 |m" "edif|f-save.x|
|00000dd0| 62 6d 22 20 74 6f 6f 6c | 62 61 72 2d 69 63 6f 6e |bm" tool|bar-icon|
|00000de0| 2d 64 69 72 65 63 74 6f | 72 79 20 22 65 64 69 66 |-directo|ry "edif|
|00000df0| 66 2d 73 61 76 65 2d 78 | 78 2e 78 70 6d 22 20 22 |f-save-x|x.xpm" "|
|00000e00| 65 64 69 66 66 2d 73 61 | 76 65 2d 78 78 2e 78 62 |ediff-sa|ve-xx.xb|
|00000e10| 6d 22 5d 20 36 29 20 28 | 23 24 20 2e 20 33 33 32 |m"] 6) (|#$ . 332|
|00000e20| 36 29 29 0a 23 40 32 31 | 20 45 78 69 74 20 45 64 |6)).#@21| Exit Ed|
|00000e30| 69 66 66 20 73 65 73 73 | 69 6f 6e 2e 1f 0a 28 64 |iff sess|ion...(d|
|00000e40| 65 66 76 61 72 20 65 64 | 69 66 66 2d 74 6f 6f 6c |efvar ed|iff-tool|
|00000e50| 62 61 72 2d 71 75 69 74 | 2d 69 63 6f 6e 20 28 62 |bar-quit|-icon (b|
|00000e60| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 ad 8f c2 |yte-code| "..!...|
|00000e70| c3 c0 c4 21 ab 83 c5 aa | 81 c6 0e 07 5c 22 21 87 |...!....|....\"!.|
|00000e80| 22 20 5b 66 65 61 74 75 | 72 65 70 20 74 6f 6f 6c |" [featu|rep tool|
|00000e90| 62 61 72 20 74 6f 6f 6c | 62 61 72 2d 6d 61 6b 65 |bar tool|bar-make|
|00000ea0| 2d 62 75 74 74 6f 6e 2d | 6c 69 73 74 20 65 78 70 |-button-|list exp|
|00000eb0| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 78 70 |and-file|-name xp|
|00000ec0| 6d 20 22 65 64 69 66 66 | 2d 71 75 69 74 2e 78 70 |m "ediff|-quit.xp|
|00000ed0| 6d 22 20 22 65 64 69 66 | 66 2d 71 75 69 74 2e 78 |m" "edif|f-quit.x|
|00000ee0| 62 6d 22 20 74 6f 6f 6c | 62 61 72 2d 69 63 6f 6e |bm" tool|bar-icon|
|00000ef0| 2d 64 69 72 65 63 74 6f | 72 79 5d 20 34 29 20 28 |-directo|ry] 4) (|
|00000f00| 23 24 20 2e 20 33 36 32 | 35 29 29 0a 23 40 31 38 |#$ . 362|5)).#@18|
|00000f10| 20 53 68 6f 77 20 45 64 | 69 66 66 20 68 65 6c 70 | Show Ed|iff help|
|00000f20| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|00000f30| 2d 74 6f 6f 6c 62 61 72 | 2d 68 65 6c 70 2d 69 63 |-toolbar|-help-ic|
|00000f40| 6f 6e 20 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |on (byte|-code ".|
|00000f50| c1 21 ad 8f c2 c3 c0 c4 | 21 ab 83 c5 aa 81 c6 0e |.!......|!.......|
|00000f60| 07 5c 22 21 87 22 20 5b | 66 65 61 74 75 72 65 70 |.\"!." [|featurep|
|00000f70| 20 74 6f 6f 6c 62 61 72 | 20 74 6f 6f 6c 62 61 72 | toolbar| toolbar|
|00000f80| 2d 6d 61 6b 65 2d 62 75 | 74 74 6f 6e 2d 6c 69 73 |-make-bu|tton-lis|
|00000f90| 74 20 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 |t expand|-file-na|
|00000fa0| 6d 65 20 78 70 6d 20 22 | 65 64 69 66 66 2d 68 65 |me xpm "|ediff-he|
|00000fb0| 6c 70 2e 78 70 6d 22 20 | 22 65 64 69 66 66 2d 68 |lp.xpm" |"ediff-h|
|00000fc0| 65 6c 70 2e 78 62 6d 22 | 20 74 6f 6f 6c 62 61 72 |elp.xbm"| toolbar|
|00000fd0| 2d 69 63 6f 6e 2d 64 69 | 72 65 63 74 6f 72 79 5d |-icon-di|rectory]|
|00000fe0| 20 34 29 20 28 23 24 20 | 2e 20 33 38 35 37 29 29 | 4) (#$ |. 3857))|
|00000ff0| 0a 23 40 33 39 20 52 65 | 66 72 65 73 68 20 45 64 |.#@39 Re|fresh Ed|
|00001000| 69 66 66 20 64 69 73 70 | 6c 61 79 20 28 61 6b 61 |iff disp|lay (aka|
|00001010| 20 72 65 63 65 6e 74 65 | 72 29 2e 1f 0a 28 64 65 | recente|r)...(de|
|00001020| 66 76 61 72 20 65 64 69 | 66 66 2d 74 6f 6f 6c 62 |fvar edi|ff-toolb|
|00001030| 61 72 2d 72 65 66 72 65 | 73 68 2d 69 63 6f 6e 20 |ar-refre|sh-icon |
|00001040| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 ad |(byte-co|de "..!.|
|00001050| 8f c2 c3 c0 c4 21 ab 83 | c5 aa 81 c6 0e 07 5c 22 |.....!..|......\"|
|00001060| 21 87 22 20 5b 66 65 61 | 74 75 72 65 70 20 74 6f |!." [fea|turep to|
|00001070| 6f 6c 62 61 72 20 74 6f | 6f 6c 62 61 72 2d 6d 61 |olbar to|olbar-ma|
|00001080| 6b 65 2d 62 75 74 74 6f | 6e 2d 6c 69 73 74 20 65 |ke-butto|n-list e|
|00001090| 78 70 61 6e 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |xpand-fi|le-name |
|000010a0| 78 70 6d 20 22 65 64 69 | 66 66 2d 75 70 64 61 74 |xpm "edi|ff-updat|
|000010b0| 65 2e 78 70 6d 22 20 22 | 65 64 69 66 66 2d 75 70 |e.xpm" "|ediff-up|
|000010c0| 64 61 74 65 2e 78 62 6d | 22 20 74 6f 6f 6c 62 61 |date.xbm|" toolba|
|000010d0| 72 2d 69 63 6f 6e 2d 64 | 69 72 65 63 74 6f 72 79 |r-icon-d|irectory|
|000010e0| 5d 20 34 29 20 28 23 24 | 20 2e 20 34 30 38 36 29 |] 4) (#$| . 4086)|
|000010f0| 29 0a 23 40 35 39 20 52 | 65 66 69 6e 65 20 63 75 |).#@59 R|efine cu|
|00001100| 72 72 65 6e 74 20 64 69 | 66 66 65 72 65 6e 63 65 |rrent di|fference|
|00001110| 20 72 65 67 69 6f 6e 20 | 62 79 20 63 6f 6d 70 75 | region |by compu|
|00001120| 74 69 6e 67 20 66 69 6e | 65 20 64 69 66 66 73 2e |ting fin|e diffs.|
|00001130| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00001140| 74 6f 6f 6c 62 61 72 2d | 72 65 66 69 6e 65 2d 69 |toolbar-|refine-i|
|00001150| 63 6f 6e 20 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |con (byt|e-code "|
|00001160| c0 c1 21 ad 8f c2 c3 c0 | c4 21 ab 83 c5 aa 81 c6 |..!.....|.!......|
|00001170| 0e 07 5c 22 21 87 22 20 | 5b 66 65 61 74 75 72 65 |..\"!." |[feature|
|00001180| 70 20 74 6f 6f 6c 62 61 | 72 20 74 6f 6f 6c 62 61 |p toolba|r toolba|
|00001190| 72 2d 6d 61 6b 65 2d 62 | 75 74 74 6f 6e 2d 6c 69 |r-make-b|utton-li|
|000011a0| 73 74 20 65 78 70 61 6e | 64 2d 66 69 6c 65 2d 6e |st expan|d-file-n|
|000011b0| 61 6d 65 20 78 70 6d 20 | 22 65 64 69 66 66 2d 72 |ame xpm |"ediff-r|
|000011c0| 65 66 69 6e 65 2e 78 70 | 6d 22 20 22 65 64 69 66 |efine.xp|m" "edif|
|000011d0| 66 2d 72 65 66 69 6e 65 | 2e 78 62 6d 22 20 74 6f |f-refine|.xbm" to|
|000011e0| 6f 6c 62 61 72 2d 69 63 | 6f 6e 2d 64 69 72 65 63 |olbar-ic|on-direc|
|000011f0| 74 6f 72 79 5d 20 34 29 | 20 28 23 24 20 2e 20 34 |tory] 4)| (#$ . 4|
|00001200| 33 34 33 29 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |343)).(d|efalias |
|00001210| 27 65 64 69 66 66 2d 74 | 6f 6f 6c 62 61 72 2d 70 |'ediff-t|oolbar-p|
|00001220| 72 65 76 69 6f 75 73 2d | 64 69 66 66 65 72 65 6e |revious-|differen|
|00001230| 63 65 20 23 5b 6e 69 6c | 20 22 c0 19 c2 c3 21 29 |ce #[nil| "....!)|
|00001240| 87 22 20 5b 6e 69 6c 20 | 65 64 69 66 66 2d 67 72 |." [nil |ediff-gr|
|00001250| 61 62 2d 6d 6f 75 73 65 | 20 65 64 69 66 66 2d 70 |ab-mouse| ediff-p|
|00001260| 72 65 76 69 6f 75 73 2d | 64 69 66 66 65 72 65 6e |revious-|differen|
|00001270| 63 65 20 31 5d 20 32 20 | 6e 69 6c 20 6e 69 6c 5d |ce 1] 2 |nil nil]|
|00001280| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00001290| 66 66 2d 74 6f 6f 6c 62 | 61 72 2d 6e 65 78 74 2d |ff-toolb|ar-next-|
|000012a0| 64 69 66 66 65 72 65 6e | 63 65 20 23 5b 6e 69 6c |differen|ce #[nil|
|000012b0| 20 22 c0 19 c2 c3 21 29 | 87 22 20 5b 6e 69 6c 20 | "....!)|." [nil |
|000012c0| 65 64 69 66 66 2d 67 72 | 61 62 2d 6d 6f 75 73 65 |ediff-gr|ab-mouse|
|000012d0| 20 65 64 69 66 66 2d 6e | 65 78 74 2d 64 69 66 66 | ediff-n|ext-diff|
|000012e0| 65 72 65 6e 63 65 20 31 | 5d 20 32 20 6e 69 6c 20 |erence 1|] 2 nil |
|000012f0| 6e 69 6c 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |nil]).(d|efalias |
|00001300| 27 65 64 69 66 66 2d 74 | 6f 6f 6c 62 61 72 2d 73 |'ediff-t|oolbar-s|
|00001310| 65 6c 65 63 74 2f 63 6f | 70 79 2d 41 20 23 5b 6e |elect/co|py-A #[n|
|00001320| 69 6c 20 22 c0 19 5c 6e | c3 73 ac 85 5c 6e c4 73 |il "..\n|.s..\n.s|
|00001330| ab 85 c5 c0 21 aa 83 c6 | c0 21 29 87 22 20 5b 6e |....!...|.!)." [n|
|00001340| 69 6c 20 65 64 69 66 66 | 2d 67 72 61 62 2d 6d 6f |il ediff|-grab-mo|
|00001350| 75 73 65 20 65 64 69 66 | 66 2d 6a 6f 62 2d 6e 61 |use edif|f-job-na|
|00001360| 6d 65 20 28 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |me (edif|f-merge-|
|00001370| 66 69 6c 65 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |files ed|iff-merg|
|00001380| 65 2d 62 75 66 66 65 72 | 73 20 65 64 69 66 66 2d |e-buffer|s ediff-|
|00001390| 6d 65 72 67 65 2d 66 69 | 6c 65 73 2d 77 69 74 68 |merge-fi|les-with|
|000013a0| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|000013b0| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 2d 77 69 |merge-bu|ffers-wi|
|000013c0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|000013d0| 66 2d 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |f-merge-|revision|
|000013e0| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |s ediff-|merge-re|
|000013f0| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00001400| 65 73 74 6f 72 29 20 28 | 65 64 69 66 66 2d 6d 65 |estor) (|ediff-me|
|00001410| 72 67 65 2d 66 69 6c 65 | 73 2d 77 69 74 68 2d 61 |rge-file|s-with-a|
|00001420| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6d 65 |ncestor |ediff-me|
|00001430| 72 67 65 2d 62 75 66 66 | 65 72 73 2d 77 69 74 68 |rge-buff|ers-with|
|00001440| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|00001450| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|00001460| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 29 20 65 |with-anc|estor) e|
|00001470| 64 69 66 66 2d 63 6f 70 | 79 2d 41 2d 74 6f 2d 43 |diff-cop|y-A-to-C|
|00001480| 20 65 64 69 66 66 2d 63 | 6f 70 79 2d 41 2d 74 6f | ediff-c|opy-A-to|
|00001490| 2d 42 5d 20 32 20 6e 69 | 6c 20 6e 69 6c 5d 29 0a |-B] 2 ni|l nil]).|
|000014a0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|000014b0| 2d 74 6f 6f 6c 62 61 72 | 2d 73 65 6c 65 63 74 2f |-toolbar|-select/|
|000014c0| 63 6f 70 79 2d 42 20 23 | 5b 6e 69 6c 20 22 c0 19 |copy-B #|[nil "..|
|000014d0| 5c 6e c3 73 ac 85 5c 6e | c4 73 ab 85 c5 c0 21 aa |\n.s..\n|.s....!.|
|000014e0| 83 c6 c0 21 29 87 22 20 | 5b 6e 69 6c 20 65 64 69 |...!)." |[nil edi|
|000014f0| 66 66 2d 67 72 61 62 2d | 6d 6f 75 73 65 20 65 64 |ff-grab-|mouse ed|
|00001500| 69 66 66 2d 6a 6f 62 2d | 6e 61 6d 65 20 28 65 64 |iff-job-|name (ed|
|00001510| 69 66 66 2d 6d 65 72 67 | 65 2d 66 69 6c 65 73 20 |iff-merg|e-files |
|00001520| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 62 75 66 66 |ediff-me|rge-buff|
|00001530| 65 72 73 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ers edif|f-merge-|
|00001540| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00001550| 74 6f 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |tor edif|f-merge-|
|00001560| 62 75 66 66 65 72 73 2d | 77 69 74 68 2d 61 6e 63 |buffers-|with-anc|
|00001570| 65 73 74 6f 72 20 65 64 | 69 66 66 2d 6d 65 72 67 |estor ed|iff-merg|
|00001580| 65 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |e-revisi|ons edif|
|00001590| 66 2d 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |f-merge-|revision|
|000015a0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 29 |s-with-a|ncestor)|
|000015b0| 20 28 65 64 69 66 66 2d | 6d 65 72 67 65 2d 66 69 | (ediff-|merge-fi|
|000015c0| 6c 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |les-with|-ancesto|
|000015d0| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 62 75 |r ediff-|merge-bu|
|000015e0| 66 66 65 72 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |ffers-wi|th-ances|
|000015f0| 74 6f 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |tor edif|f-merge-|
|00001600| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|00001610| 6e 63 65 73 74 6f 72 29 | 20 65 64 69 66 66 2d 63 |ncestor)| ediff-c|
|00001620| 6f 70 79 2d 42 2d 74 6f | 2d 43 20 65 64 69 66 66 |opy-B-to|-C ediff|
|00001630| 2d 63 6f 70 79 2d 42 2d | 74 6f 2d 41 5d 20 32 20 |-copy-B-|to-A] 2 |
|00001640| 6e 69 6c 20 6e 69 6c 5d | 29 0a 28 64 65 66 61 6c |nil nil]|).(defal|
|00001650| 69 61 73 20 27 65 64 69 | 66 66 2d 74 6f 6f 6c 62 |ias 'edi|ff-toolb|
|00001660| 61 72 2d 74 6f 67 67 6c | 65 2d 73 70 6c 69 74 20 |ar-toggl|e-split |
|00001670| 23 5b 6e 69 6c 20 22 c0 | 19 c2 20 29 87 22 20 5b |#[nil ".|.. )." [|
|00001680| 6e 69 6c 20 65 64 69 66 | 66 2d 67 72 61 62 2d 6d |nil edif|f-grab-m|
|00001690| 6f 75 73 65 20 65 64 69 | 66 66 2d 74 6f 67 67 6c |ouse edi|ff-toggl|
|000016a0| 65 2d 73 70 6c 69 74 5d | 20 31 20 6e 69 6c 20 6e |e-split]| 1 nil n|
|000016b0| 69 6c 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |il]).(de|falias '|
|000016c0| 65 64 69 66 66 2d 74 6f | 6f 6c 62 61 72 2d 73 61 |ediff-to|olbar-sa|
|000016d0| 76 65 20 23 5b 6e 69 6c | 20 22 c0 19 c2 09 21 ac |ve #[nil| "....!.|
|000016e0| 85 c3 c4 0d 5c 22 88 29 | 0e 06 c7 73 ab 84 c8 c9 |....\".)|...s....|
|000016f0| 21 87 ca cb cc 5c 22 87 | 22 20 5b 6e 69 6c 20 6d |!....\".|" [nil m|
|00001700| 65 74 61 2d 62 75 66 2d | 70 20 65 64 69 66 66 2d |eta-buf-|p ediff-|
|00001710| 69 6e 2d 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |in-contr|ol-buffe|
|00001720| 72 2d 70 20 65 72 72 6f | 72 20 22 25 53 3a 20 54 |r-p erro|r "%S: T|
|00001730| 68 69 73 20 63 6f 6d 6d | 61 6e 64 20 72 75 6e 73 |his comm|and runs|
|00001740| 20 69 6e 20 45 64 69 66 | 66 20 43 6f 6e 74 72 6f | in Edif|f Contro|
|00001750| 6c 20 42 75 66 66 65 72 | 20 6f 6e 6c 79 21 22 20 |l Buffer| only!" |
|00001760| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|00001770| 66 66 2d 6a 6f 62 2d 6e | 61 6d 65 20 28 65 64 69 |ff-job-n|ame (edi|
|00001780| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 20 65 |ff-merge|-files e|
|00001790| 64 69 66 66 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |diff-mer|ge-buffe|
|000017a0| 72 73 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 66 |rs ediff|-merge-f|
|000017b0| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|000017c0| 6f 72 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 62 |or ediff|-merge-b|
|000017d0| 75 66 66 65 72 73 2d 77 | 69 74 68 2d 61 6e 63 65 |uffers-w|ith-ance|
|000017e0| 73 74 6f 72 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |stor edi|ff-merge|
|000017f0| 2d 72 65 76 69 73 69 6f | 6e 73 20 65 64 69 66 66 |-revisio|ns ediff|
|00001800| 2d 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |-merge-r|evisions|
|00001810| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 29 20 |-with-an|cestor) |
|00001820| 65 64 69 66 66 2d 6d 61 | 79 62 65 2d 73 61 76 65 |ediff-ma|ybe-save|
|00001830| 2d 61 6e 64 2d 64 65 6c | 65 74 65 2d 6d 65 72 67 |-and-del|ete-merg|
|00001840| 65 20 73 61 76 65 2d 61 | 6e 64 2d 63 6f 6e 74 69 |e save-a|nd-conti|
|00001850| 6e 75 65 20 6d 61 70 63 | 61 72 20 23 5b 28 74 79 |nue mapc|ar #[(ty|
|00001860| 70 65 29 20 22 08 c1 61 | ab 83 5c 6e aa 98 08 c3 |pe) "..a|..\n....|
|00001870| 61 ab 83 0c aa 90 08 c5 | 61 ab 84 0e 06 aa 87 08 |a.......|a.......|
|00001880| c7 61 ad 82 0e 08 89 1e | 09 ad b8 ca 0e 09 21 ad |.a......|......!.|
|00001890| b2 cb ca 0e 09 21 21 ad | aa 0e 09 ab 9c ca 0e 09 |.....!!.|........|
|000018a0| 21 ab 96 cb ca 0e 09 21 | 21 ab 8e 72 0e 09 71 88 |!......!|!..r..q.|
|000018b0| cc 20 ad 82 cd 20 29 aa | 8a 0e 0e cf 61 ae 84 d0 |. ... ).|....a...|
|000018c0| 0e 11 21 29 87 22 20 5b | 74 79 70 65 20 41 20 65 |..!)." [|type A e|
|000018d0| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 41 20 42 20 |diff-buf|fer-A B |
|000018e0| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 42 20 43 |ediff-bu|ffer-B C|
|000018f0| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 43 20 | ediff-b|uffer-C |
|00001900| 41 6e 63 65 73 74 6f 72 | 20 65 64 69 66 66 2d 61 |Ancestor| ediff-a|
|00001910| 6e 63 65 73 74 6f 72 2d | 62 75 66 66 65 72 20 65 |ncestor-|buffer e|
|00001920| 62 75 66 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |buf get-|buffer b|
|00001930| 75 66 66 65 72 2d 6e 61 | 6d 65 20 62 75 66 66 65 |uffer-na|me buffe|
|00001940| 72 2d 6d 6f 64 69 66 69 | 65 64 2d 70 20 73 61 76 |r-modifi|ed-p sav|
|00001950| 65 2d 62 75 66 66 65 72 | 20 74 68 69 73 2d 63 6f |e-buffer| this-co|
|00001960| 6d 6d 61 6e 64 20 65 64 | 69 66 66 2d 71 75 69 74 |mmand ed|iff-quit|
|00001970| 20 65 72 72 6f 72 20 65 | 64 69 66 66 2d 4b 49 4c | error e|diff-KIL|
|00001980| 4c 45 44 2d 56 49 54 41 | 4c 2d 42 55 46 46 45 52 |LED-VITA|L-BUFFER|
|00001990| 5d 20 34 5d 20 28 41 20 | 42 20 43 29 5d 20 33 20 |] 4] (A |B C)] 3 |
|000019a0| 6e 69 6c 20 6e 69 6c 5d | 29 0a 28 64 65 66 61 6c |nil nil]|).(defal|
|000019b0| 69 61 73 20 27 65 64 69 | 66 66 2d 74 6f 6f 6c 62 |ias 'edi|ff-toolb|
|000019c0| 61 72 2d 71 75 69 74 20 | 23 5b 6e 69 6c 20 22 c0 |ar-quit |#[nil ".|
|000019d0| 19 c2 c0 21 29 87 22 20 | 5b 6e 69 6c 20 65 64 69 |...!)." |[nil edi|
|000019e0| 66 66 2d 67 72 61 62 2d | 6d 6f 75 73 65 20 65 64 |ff-grab-|mouse ed|
|000019f0| 69 66 66 2d 71 75 69 74 | 5d 20 32 20 6e 69 6c 20 |iff-quit|] 2 nil |
|00001a00| 6e 69 6c 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |nil]).(d|efalias |
|00001a10| 27 65 64 69 66 66 2d 74 | 6f 6f 6c 62 61 72 2d 68 |'ediff-t|oolbar-h|
|00001a20| 65 6c 70 20 23 5b 6e 69 | 6c 20 22 c0 20 87 22 20 |elp #[ni|l ". ." |
|00001a30| 5b 65 64 69 66 66 2d 74 | 6f 67 67 6c 65 2d 68 65 |[ediff-t|oggle-he|
|00001a40| 6c 70 5d 20 31 20 6e 69 | 6c 20 6e 69 6c 5d 29 0a |lp] 1 ni|l nil]).|
|00001a50| 23 40 31 30 20 52 65 63 | 65 6e 74 65 72 1f 0a 28 |#@10 Rec|enter..(|
|00001a60| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00001a70| 74 6f 6f 6c 62 61 72 2d | 72 65 66 72 65 73 68 20 |toolbar-|refresh |
|00001a80| 23 5b 6e 69 6c 20 22 c0 | 19 c2 20 29 87 22 20 5b |#[nil ".|.. )." [|
|00001a90| 6e 69 6c 20 65 64 69 66 | 66 2d 67 72 61 62 2d 6d |nil edif|f-grab-m|
|00001aa0| 6f 75 73 65 20 65 64 69 | 66 66 2d 72 65 63 65 6e |ouse edi|ff-recen|
|00001ab0| 74 65 72 5d 20 31 20 28 | 23 24 20 2e 20 36 37 34 |ter] 1 (|#$ . 674|
|00001ac0| 31 29 20 6e 69 6c 5d 29 | 0a 23 40 35 39 20 52 65 |1) nil])|.#@59 Re|
|00001ad0| 66 69 6e 65 20 63 75 72 | 72 65 6e 74 20 64 69 66 |fine cur|rent dif|
|00001ae0| 66 65 72 65 6e 63 65 20 | 72 65 67 69 6f 6e 20 62 |ference |region b|
|00001af0| 79 20 63 6f 6d 70 75 74 | 69 6e 67 20 66 69 6e 65 |y comput|ing fine|
|00001b00| 20 64 69 66 66 73 2e 1f | 0a 28 64 65 66 61 6c 69 | diffs..|.(defali|
|00001b10| 61 73 20 27 65 64 69 66 | 66 2d 74 6f 6f 6c 62 61 |as 'edif|f-toolba|
|00001b20| 72 2d 72 65 66 69 6e 65 | 20 23 5b 6e 69 6c 20 22 |r-refine| #[nil "|
|00001b30| c0 19 c2 c3 21 29 87 22 | 20 5b 6e 69 6c 20 65 64 |....!)."| [nil ed|
|00001b40| 69 66 66 2d 67 72 61 62 | 2d 6d 6f 75 73 65 20 65 |iff-grab|-mouse e|
|00001b50| 64 69 66 66 2d 6d 61 6b | 65 2d 6f 72 2d 6b 69 6c |diff-mak|e-or-kil|
|00001b60| 6c 2d 66 69 6e 65 2d 64 | 69 66 66 73 20 6d 61 6b |l-fine-d|iffs mak|
|00001b70| 65 2d 74 68 65 6d 5d 20 | 32 20 28 23 24 20 2e 20 |e-them] |2 (#$ . |
|00001b80| 36 38 36 32 29 20 6e 69 | 6c 5d 29 0a 28 64 65 66 |6862) ni|l]).(def|
|00001b90| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 74 6f 6f |alias 'e|diff-too|
|00001ba0| 6c 62 61 72 2d 72 65 66 | 69 6e 65 2d 6e 65 65 64 |lbar-ref|ine-need|
|00001bb0| 65 64 2d 70 20 23 5b 6e | 69 6c 20 22 08 c1 56 ad |ed-p #[n|il "..V.|
|00001bc0| 8d 5c 6e c3 c4 c5 08 23 | c3 c4 c6 08 23 5a 56 87 |.\n....#|....#ZV.|
|00001bd0| 22 20 5b 65 64 69 66 66 | 2d 63 75 72 72 65 6e 74 |" [ediff|-current|
|00001be0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 30 20 65 64 |-differe|nce 0 ed|
|00001bf0| 69 66 66 2d 61 75 74 6f | 2d 72 65 66 69 6e 65 2d |iff-auto|-refine-|
|00001c00| 6c 69 6d 69 74 20 65 64 | 69 66 66 2d 67 65 74 2d |limit ed|iff-get-|
|00001c10| 64 69 66 66 2d 70 6f 73 | 6e 20 41 20 65 6e 64 20 |diff-pos|n A end |
|00001c20| 62 65 67 5d 20 36 5d 29 | 0a 28 62 79 74 65 2d 63 |beg] 6])|.(byte-c|
|00001c30| 6f 64 65 20 22 c0 c1 21 | ac 87 c2 c3 21 ad 81 c4 |ode "..!|....!...|
|00001c40| 11 c1 0d 42 15 c0 c6 21 | ac 88 c2 c3 21 ad 81 c7 |...B...!|....!...|
|00001c50| 16 06 c6 0d 42 15 c0 87 | 22 20 5b 62 6f 75 6e 64 |....B...|" [bound|
|00001c60| 70 20 65 64 69 66 66 2d | 74 6f 6f 6c 62 61 72 20 |p ediff-|toolbar |
|00001c70| 66 65 61 74 75 72 65 70 | 20 74 6f 6f 6c 62 61 72 |featurep| toolbar|
|00001c80| 20 28 5b 65 64 69 66 66 | 2d 74 6f 6f 6c 62 61 72 | ([ediff|-toolbar|
|00001c90| 2d 72 65 66 69 6e 65 2d | 69 63 6f 6e 20 65 64 69 |-refine-|icon edi|
|00001ca0| 66 66 2d 74 6f 6f 6c 62 | 61 72 2d 72 65 66 69 6e |ff-toolb|ar-refin|
|00001cb0| 65 20 74 20 22 52 65 66 | 69 6e 65 20 63 75 72 72 |e t "Ref|ine curr|
|00001cc0| 65 6e 74 20 64 69 66 66 | 65 72 65 6e 63 65 20 72 |ent diff|erence r|
|00001cd0| 65 67 69 6f 6e 20 62 79 | 20 63 6f 6d 70 75 74 69 |egion by| computi|
|00001ce0| 6e 67 20 66 69 6e 65 20 | 64 69 66 66 73 2e 22 5d |ng fine |diffs."]|
|00001cf0| 20 5b 65 64 69 66 66 2d | 74 6f 6f 6c 62 61 72 2d | [ediff-|toolbar-|
|00001d00| 70 72 65 76 69 6f 75 73 | 2d 69 63 6f 6e 20 65 64 |previous|-icon ed|
|00001d10| 69 66 66 2d 74 6f 6f 6c | 62 61 72 2d 70 72 65 76 |iff-tool|bar-prev|
|00001d20| 69 6f 75 73 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |ious-dif|ference |
|00001d30| 74 20 22 47 6f 20 74 6f | 20 74 68 65 20 70 72 65 |t "Go to| the pre|
|00001d40| 76 69 6f 75 73 20 64 69 | 66 66 65 72 65 6e 63 65 |vious di|fference|
|00001d50| 2e 22 5d 20 5b 65 64 69 | 66 66 2d 74 6f 6f 6c 62 |."] [edi|ff-toolb|
|00001d60| 61 72 2d 6e 65 78 74 2d | 69 63 6f 6e 20 65 64 69 |ar-next-|icon edi|
|00001d70| 66 66 2d 74 6f 6f 6c 62 | 61 72 2d 6e 65 78 74 2d |ff-toolb|ar-next-|
|00001d80| 64 69 66 66 65 72 65 6e | 63 65 20 74 20 22 41 64 |differen|ce t "Ad|
|00001d90| 76 61 6e 63 65 20 74 6f | 20 74 68 65 20 6e 65 78 |vance to| the nex|
|00001da0| 74 20 64 69 66 66 65 72 | 65 6e 63 65 2e 22 5d 20 |t differ|ence."] |
|00001db0| 5b 65 64 69 66 66 2d 74 | 6f 6f 6c 62 61 72 2d 41 |[ediff-t|oolbar-A|
|00001dc0| 2d 69 63 6f 6e 20 65 64 | 69 66 66 2d 74 6f 6f 6c |-icon ed|iff-tool|
|00001dd0| 62 61 72 2d 73 65 6c 65 | 63 74 2f 63 6f 70 79 2d |bar-sele|ct/copy-|
|00001de0| 41 20 28 6e 6f 74 20 28 | 65 64 69 66 66 2d 33 77 |A (not (|ediff-3w|
|00001df0| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 6a 6f |ay-compa|rison-jo|
|00001e00| 62 29 29 20 22 53 65 6c | 65 63 74 2f 43 6f 70 79 |b)) "Sel|ect/Copy|
|00001e10| 20 64 69 66 66 65 72 65 | 6e 63 65 20 41 2e 22 5d | differe|nce A."]|
|00001e20| 20 5b 65 64 69 66 66 2d | 74 6f 6f 6c 62 61 72 2d | [ediff-|toolbar-|
|00001e30| 42 2d 69 63 6f 6e 20 65 | 64 69 66 66 2d 74 6f 6f |B-icon e|diff-too|
|00001e40| 6c 62 61 72 2d 73 65 6c | 65 63 74 2f 63 6f 70 79 |lbar-sel|ect/copy|
|00001e50| 2d 42 20 28 6e 6f 74 20 | 28 65 64 69 66 66 2d 33 |-B (not |(ediff-3|
|00001e60| 77 61 79 2d 63 6f 6d 70 | 61 72 69 73 6f 6e 2d 6a |way-comp|arison-j|
|00001e70| 6f 62 29 29 20 22 53 65 | 6c 65 63 74 2f 43 6f 70 |ob)) "Se|lect/Cop|
|00001e80| 79 20 64 69 66 66 65 72 | 65 6e 63 65 20 42 2e 22 |y differ|ence B."|
|00001e90| 5d 20 5b 65 64 69 66 66 | 2d 74 6f 6f 6c 62 61 72 |] [ediff|-toolbar|
|00001ea0| 2d 73 61 76 65 2d 69 63 | 6f 6e 20 65 64 69 66 66 |-save-ic|on ediff|
|00001eb0| 2d 74 6f 6f 6c 62 61 72 | 2d 73 61 76 65 20 74 20 |-toolbar|-save t |
|00001ec0| 22 53 61 76 65 20 62 75 | 66 66 65 72 73 20 6d 6f |"Save bu|ffers mo|
|00001ed0| 64 69 66 69 65 64 20 69 | 6e 20 74 68 69 73 20 73 |dified i|n this s|
|00001ee0| 65 73 73 69 6f 6e 2e 22 | 5d 20 5b 65 64 69 66 66 |ession."|] [ediff|
|00001ef0| 2d 74 6f 6f 6c 62 61 72 | 2d 72 65 66 72 65 73 68 |-toolbar|-refresh|
|00001f00| 2d 69 63 6f 6e 20 65 64 | 69 66 66 2d 74 6f 6f 6c |-icon ed|iff-tool|
|00001f10| 62 61 72 2d 72 65 66 72 | 65 73 68 20 74 20 22 52 |bar-refr|esh t "R|
|00001f20| 65 66 72 65 73 68 20 45 | 64 69 66 66 20 64 69 73 |efresh E|diff dis|
|00001f30| 70 6c 61 79 20 28 61 6b | 61 20 72 65 63 65 6e 74 |play (ak|a recent|
|00001f40| 65 72 29 2e 22 5d 20 5b | 65 64 69 66 66 2d 74 6f |er)."] [|ediff-to|
|00001f50| 6f 6c 62 61 72 2d 74 6f | 67 67 6c 65 2d 73 70 6c |olbar-to|ggle-spl|
|00001f60| 69 74 2d 69 63 6f 6e 20 | 65 64 69 66 66 2d 74 6f |it-icon |ediff-to|
|00001f70| 6f 6c 62 61 72 2d 74 6f | 67 67 6c 65 2d 73 70 6c |olbar-to|ggle-spl|
|00001f80| 69 74 20 74 20 22 54 6f | 67 67 6c 65 20 73 70 6c |it t "To|ggle spl|
|00001f90| 69 74 20 6d 6f 64 65 20 | 62 65 74 77 65 65 6e 20 |it mode |between |
|00001fa0| 73 69 64 65 2d 74 6f 2d | 73 69 64 65 20 61 6e 64 |side-to-|side and|
|00001fb0| 20 6f 6e 65 2d 6f 6e 2d | 74 6f 70 2d 6f 66 2d 61 | one-on-|top-of-a|
|00001fc0| 6e 6f 74 68 65 72 2e 22 | 5d 20 5b 65 64 69 66 66 |nother."|] [ediff|
|00001fd0| 2d 74 6f 6f 6c 62 61 72 | 2d 68 65 6c 70 2d 69 63 |-toolbar|-help-ic|
|00001fe0| 6f 6e 20 65 64 69 66 66 | 2d 74 6f 6f 6c 62 61 72 |on ediff|-toolbar|
|00001ff0| 2d 68 65 6c 70 20 74 20 | 22 54 6f 67 67 6c 65 20 |-help t |"Toggle |
|00002000| 73 68 6f 72 74 2f 6c 6f | 6e 67 20 68 65 6c 70 2e |short/lo|ng help.|
|00002010| 22 5d 20 6e 69 6c 20 5b | 65 64 69 66 66 2d 74 6f |"] nil [|ediff-to|
|00002020| 6f 6c 62 61 72 2d 71 75 | 69 74 2d 69 63 6f 6e 20 |olbar-qu|it-icon |
|00002030| 65 64 69 66 66 2d 74 6f | 6f 6c 62 61 72 2d 71 75 |ediff-to|olbar-qu|
|00002040| 69 74 20 74 20 22 51 75 | 69 74 20 74 68 69 73 20 |it t "Qu|it this |
|00002050| 65 64 69 66 66 20 73 65 | 73 73 69 6f 6e 2e 22 5d |ediff se|ssion."]|
|00002060| 29 20 63 75 72 72 65 6e | 74 2d 6c 6f 61 64 2d 6c |) curren|t-load-l|
|00002070| 69 73 74 20 65 64 69 66 | 66 2d 74 6f 6f 6c 62 61 |ist edif|f-toolba|
|00002080| 72 2d 33 77 61 79 20 28 | 5b 65 64 69 66 66 2d 74 |r-3way (|[ediff-t|
|00002090| 6f 6f 6c 62 61 72 2d 72 | 65 66 69 6e 65 2d 69 63 |oolbar-r|efine-ic|
|000020a0| 6f 6e 20 65 64 69 66 66 | 2d 74 6f 6f 6c 62 61 72 |on ediff|-toolbar|
|000020b0| 2d 72 65 66 69 6e 65 20 | 74 20 22 52 65 66 69 6e |-refine |t "Refin|
|000020c0| 65 20 63 75 72 72 65 6e | 74 20 64 69 66 66 65 72 |e curren|t differ|
|000020d0| 65 6e 63 65 20 72 65 67 | 69 6f 6e 20 62 79 20 63 |ence reg|ion by c|
|000020e0| 6f 6d 70 75 74 69 6e 67 | 20 66 69 6e 65 20 64 69 |omputing| fine di|
|000020f0| 66 66 73 2e 22 5d 20 5b | 65 64 69 66 66 2d 74 6f |ffs."] [|ediff-to|
|00002100| 6f 6c 62 61 72 2d 70 72 | 65 76 69 6f 75 73 2d 69 |olbar-pr|evious-i|
|00002110| 63 6f 6e 20 65 64 69 66 | 66 2d 74 6f 6f 6c 62 61 |con edif|f-toolba|
|00002120| 72 2d 70 72 65 76 69 6f | 75 73 2d 64 69 66 66 65 |r-previo|us-diffe|
|00002130| 72 65 6e 63 65 20 74 20 | 22 47 6f 20 74 6f 20 74 |rence t |"Go to t|
|00002140| 68 65 20 70 72 65 76 69 | 6f 75 73 20 64 69 66 66 |he previ|ous diff|
|00002150| 65 72 65 6e 63 65 2e 22 | 5d 20 5b 65 64 69 66 66 |erence."|] [ediff|
|00002160| 2d 74 6f 6f 6c 62 61 72 | 2d 6e 65 78 74 2d 69 63 |-toolbar|-next-ic|
|00002170| 6f 6e 20 65 64 69 66 66 | 2d 74 6f 6f 6c 62 61 72 |on ediff|-toolbar|
|00002180| 2d 6e 65 78 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |-next-di|fference|
|00002190| 20 74 20 22 41 64 76 61 | 6e 63 65 20 74 6f 20 74 | t "Adva|nce to t|
|000021a0| 68 65 20 6e 65 78 74 20 | 64 69 66 66 65 72 65 6e |he next |differen|
|000021b0| 63 65 2e 22 5d 20 5b 65 | 64 69 66 66 2d 74 6f 6f |ce."] [e|diff-too|
|000021c0| 6c 62 61 72 2d 73 61 76 | 65 2d 69 63 6f 6e 20 65 |lbar-sav|e-icon e|
|000021d0| 64 69 66 66 2d 74 6f 6f | 6c 62 61 72 2d 73 61 76 |diff-too|lbar-sav|
|000021e0| 65 20 74 20 22 53 61 76 | 65 20 62 75 66 66 65 72 |e t "Sav|e buffer|
|000021f0| 73 20 6d 6f 64 69 66 69 | 65 64 20 69 6e 20 74 68 |s modifi|ed in th|
|00002200| 69 73 20 73 65 73 73 69 | 6f 6e 2e 22 5d 20 5b 65 |is sessi|on."] [e|
|00002210| 64 69 66 66 2d 74 6f 6f | 6c 62 61 72 2d 72 65 66 |diff-too|lbar-ref|
|00002220| 72 65 73 68 2d 69 63 6f | 6e 20 65 64 69 66 66 2d |resh-ico|n ediff-|
|00002230| 74 6f 6f 6c 62 61 72 2d | 72 65 66 72 65 73 68 20 |toolbar-|refresh |
|00002240| 74 20 22 52 65 66 72 65 | 73 68 20 45 64 69 66 66 |t "Refre|sh Ediff|
|00002250| 20 64 69 73 70 6c 61 79 | 20 28 61 6b 61 20 72 65 | display| (aka re|
|00002260| 63 65 6e 74 65 72 29 2e | 22 5d 20 5b 65 64 69 66 |center).|"] [edif|
|00002270| 66 2d 74 6f 6f 6c 62 61 | 72 2d 74 6f 67 67 6c 65 |f-toolba|r-toggle|
|00002280| 2d 73 70 6c 69 74 2d 69 | 63 6f 6e 20 65 64 69 66 |-split-i|con edif|
|00002290| 66 2d 74 6f 6f 6c 62 61 | 72 2d 74 6f 67 67 6c 65 |f-toolba|r-toggle|
|000022a0| 2d 73 70 6c 69 74 20 74 | 20 22 54 6f 67 67 6c 65 |-split t| "Toggle|
|000022b0| 20 73 70 6c 69 74 20 6d | 6f 64 65 20 62 65 74 77 | split m|ode betw|
|000022c0| 65 65 6e 20 73 69 64 65 | 2d 74 6f 2d 73 69 64 65 |een side|-to-side|
|000022d0| 20 61 6e 64 20 6f 6e 65 | 2d 6f 6e 2d 74 6f 70 2d | and one|-on-top-|
|000022e0| 6f 66 2d 61 6e 6f 74 68 | 65 72 2e 22 5d 20 5b 65 |of-anoth|er."] [e|
|000022f0| 64 69 66 66 2d 74 6f 6f | 6c 62 61 72 2d 68 65 6c |diff-too|lbar-hel|
|00002300| 70 2d 69 63 6f 6e 20 65 | 64 69 66 66 2d 74 6f 6f |p-icon e|diff-too|
|00002310| 6c 62 61 72 2d 68 65 6c | 70 20 74 20 22 54 6f 67 |lbar-hel|p t "Tog|
|00002320| 67 6c 65 20 73 68 6f 72 | 74 2f 6c 6f 6e 67 20 68 |gle shor|t/long h|
|00002330| 65 6c 70 2e 22 5d 20 6e | 69 6c 20 5b 65 64 69 66 |elp."] n|il [edif|
|00002340| 66 2d 74 6f 6f 6c 62 61 | 72 2d 71 75 69 74 2d 69 |f-toolba|r-quit-i|
|00002350| 63 6f 6e 20 65 64 69 66 | 66 2d 74 6f 6f 6c 62 61 |con edif|f-toolba|
|00002360| 72 2d 71 75 69 74 20 74 | 20 22 51 75 69 74 20 74 |r-quit t| "Quit t|
|00002370| 68 69 73 20 65 64 69 66 | 66 20 73 65 73 73 69 6f |his edif|f sessio|
|00002380| 6e 2e 22 5d 29 5d 20 32 | 29 0a                   |n."])] 2|).      |
+--------+-------------------------+-------------------------+--------+--------+